Skip to content

Update spotless to meet JDK-21 baseline#533

Merged
prudhvigodithi merged 1 commit intoopensearch-project:mainfrom
reta:add.jdk21
Feb 9, 2024
Merged

Update spotless to meet JDK-21 baseline#533
prudhvigodithi merged 1 commit intoopensearch-project:mainfrom
reta:add.jdk21

Conversation

@reta
Copy link
Copy Markdown
Contributor

@reta reta commented Feb 6, 2024

Is your feature request related to a problem? Please provide an existing Issue # , or describe.
Add JDK-21 to Github actions

Describe the solution you are proposing
A clear and concise description of what you want to happen.

Describe alternatives you've considered
A clear and concise description of any alternative solutions or features you've considered.

Additional context
Add any other context or screenshots about the feature request here.

Check List

  • Backport Labels added.
  • New functionality includes testing.
    • All tests pass
  • New functionality has been documented.
    • New functionality has javadoc added
  • Commits are signed per the DCO using --signoff

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.

@reta
Copy link
Copy Markdown
Contributor Author

reta commented Feb 6, 2024

@ansjcy purely formatting updates (spotless update is needed to work with JDK-21)

ansjcy
ansjcy previously approved these changes Feb 6, 2024
Copy link
Copy Markdown
Member

@ansjcy ansjcy left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM.

@@ -34,6 +35,7 @@
@PowerMockIgnore({"org.apache.logging.log4j.*", "com.sun.org.apache.xerces.*"})
@RunWith(PowerMockRunner.class)
@PrepareForTest({NetClient.class, InterNodeRpcServiceGrpc.InterNodeRpcServiceStub.class})
@Ignore("See please https://github.com/opensearch-project/performance-analyzer-rca/issues/529")
Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ansjcy we need to work on PowerMock removal, #529, it is not playing well with recent JDKs (and is dead essentially)

getsaurabh02
getsaurabh02 previously approved these changes Feb 6, 2024
@codecov
Copy link
Copy Markdown

codecov bot commented Feb 6, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (344cae1) 74.41% compared to head (4041830) 74.42%.
Report is 1 commits behind head on main.

Additional details and impacted files
@@            Coverage Diff            @@
##               main     #533   +/-   ##
=========================================
  Coverage     74.41%   74.42%           
  Complexity     2666     2666           
=========================================
  Files           317      317           
  Lines         16377    16377           
  Branches       1282     1282           
=========================================
+ Hits          12187    12188    +1     
+ Misses         3675     3674    -1     
  Partials        515      515           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
@reta reta changed the title Add JDK-21 to Github actions Update spotless to meet JDK-21 baseline Feb 7, 2024
@prudhvigodithi
Copy link
Copy Markdown
Member

Looks like this is the change required for 2.12 builds to pass, opensearch-project/performance-analyzer#611, can we please get this in soon and backport to 2.x?

@prudhvigodithi prudhvigodithi merged commit 3c92f12 into opensearch-project:main Feb 9, 2024
@opensearch-trigger-bot
Copy link
Copy Markdown

The backport to 2.x failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-2.x 2.x
# Navigate to the new working tree
cd .worktrees/backport-2.x
# Create a new branch
git switch --create backport/backport-533-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 3c92f12e3ef0789bc7c7bda2a28b85a350008e80
# Push it to GitHub
git push --set-upstream origin backport/backport-533-to-2.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-2.x

Then, create a pull request where the base branch is 2.x and the compare/head branch is backport/backport-533-to-2.x.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants